bitkeeper revision 1.1719 (42b36f87tzUHBhdJfZKC_wBV271T0g)

manual merge

diff --cc BitKeeper/etc/logging_ok
index afc6cd647f51346389ac525553662d799074275a,1930de66268cb2e7c327c99ea59753f96b4dc6b1..2443869070a072c21ddb502d33ce3f2022d96c54
--- 1/BitKeeper/etc/logging_ok
--- 2/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@@ -21,18 -15,13 +21,19 @@@ cl349@arcadians.cl.cam.ac.u
  cl349@firebug.cl.cam.ac.uk
  cl349@freefall.cl.cam.ac.uk
  cl349@labyrinth.cl.cam.ac.uk
 +cw@f00f.org
  cwc22@centipede.cl.cam.ac.uk
 +cwc22@donkeykong.cl.cam.ac.uk
 +djm@djmnc4000.(none)
  djm@kirby.fc.hp.com
 +djm@sportsman.spdomain
  doogie@brainfood.com
+ dsteklof@us.ibm.com
  gm281@boulderdash.cl.cam.ac.uk
  gm281@tetrapod.cl.cam.ac.uk
 +harry@dory.(none)
  hollisb@us.ibm.com
 +iap10@firebug.cl.cam.ac.uk
  iap10@freefall.cl.cam.ac.uk
  iap10@labyrinth.cl.cam.ac.uk
  iap10@nidd.cl.cam.ac.uk

diff --cc tools/libxc/xc.h
index 27e7845798cce1904088119436015ef0ad897d65,5f46b5f1373905c886e7d0b2aa536dc0103822c8..3123d6e5a4d73731c34e7f9f5dd597c61a995357
--- 1/tools/libxc/xc.h
--- 2/tools/libxc/xc.h
+++ b/tools/libxc/xc.h
@@@ -166,10 -112,13 +166,14 @@@ int xc_domain_destroy(int xc_handle
                        u32 domid);
  int xc_domain_pincpu(int xc_handle,
                       u32 domid,
 -                     int cpu);
 +                     int vcpu,
 +                     cpumap_t *cpumap);
  /**
-  * This function will return information about one or more domains.
+  * This function will return information about one or more domains. It is
+  * designed to iterate over the list of domains. If a single domain is
+  * requested, this function will return the next domain in the list - if
+  * one exists. It is, therefore, important in this case to make sure the
+  * domain requested was the one returned.
   *
   * @parm xc_handle a handle to an open hypervisor interface
   * @parm first_domid the first domain to enumerate information from.  Domains